Merge pull request #18 from densh/hackathon/16-apr-2014

Hackathon Apr 16, 2014
fixes annots
Merge pull request #19 from xeno-by/master

fixes annots
Hackacthon Apr 16, 2014