dummy commit to get new travis build
Merge pull request #108 from zelgerj/master

dummy commit to get new travis build