Cleanup and speed improvement
Minor
Fix alignment bug
Merge pull request #6 from jenskutilek/master

Cleanup and speed improvements