Revert "Merge to master"

Reverts hub387/projectx#6