Unify scripts

This pull request fixes #16