commit for merge
solved merge conflict:
Merge pull request #3 from tiger-swallowtails-2014/mike

Mike