Merge pull request #2 from JPMoresmau/master

Performance and bug fixes