Merge pull request #10 from Rukenshia/dev_untested

See commits for details
Merge branch 'dev_untested'