Merge pull request #23 from oncletom/master

Adding bunch of fix