Alan K Merge pull request #20 from luser/develop