Improvements

Updated Nov 15, 2017

Possible improvements, low priority

Tests

Updated Sep 7, 2017

Improvement of test coverage