fixup
Merge pull request #2 from apanzerj/apanzerj/2014_09_08

   fixup