Fixed a rather dubious design decision.
Merge branch 'master' of https://github.com/myarov/arcocode