Merge pull request #6 from PandaView/master

Update master