fixed test
added check
fixed painful bug
Merge pull request #34 from badnack/development

Development