Merge pull request #19 from am11/master

Assembly version updated to v 1.1
Merge pull request #20 from am11/master

More fixes for #15
Performance improvements