fennb Merge pull request #128 from tonybyng/master