commit 5ac0db0b98e5b4e690aca0aa7fb6ec60ceddcb06
Merge: 1c203d9 172e633
Author: Kjetil Matheussen <k.s.matheussen@notam02.no>
Date:   Sat Sep 12 16:15:24 2015 +0200

    Merge pull request #3 from atsampson/master
    
    Two minor fixes
