Revert "Revert "Merge pull request #12 from powtac/patch-1""

This reverts commit 90f33ea354acbb79554168a6e8e51c87dd0973d6.