readd most..
Merge pull request #42 from cpasmoi/master

Merging previous changes back to repo, thanks Truc!