Remove trimming white space
Remove dummy annotations
Merge pull request #59 from tbeu/fix-dummy-annotations

Fix dummy annotations
Merge pull request #1 from dzimmer/master

merge into local copy