Merge pull request #33 from petersohn/master

Refactored track creation