Merge pull request #16 from tiger-swallowtails-2014/mike

Mike
minor fixes