Merge pull request #79 from dereuromark/develop

proof that both old and new syntax works
travis support