minor changes
fixed a problem with singleton macros and added some tests
updated version number
Merge branch 'hotfix/0.2.1'