some cleanup and edited signifier added
Merge branch 'master' of https://github.com/martflu/amanaman