Some updates

Addition to previous improvements. Up minor release
Merge pull request #3 from linlex/master

Addition to previous improvements