pushed back bugfixes
Merge branch 'develop' of github.com:shriken/frozen-syntax into develop