Testing branch
Merge pull request #12 from hatchan/feature_1.2

Just do it