quick update
Merge pull request #2 from RogueAnt/branch-1

quick update from Greg