Merge pull request #11 from vokal-isaac/master

Trying out Travis-CI's new Xcode 6.1 image.