Merge pull request #6 from LoadingPleaseWait/lpw

Merge lpw and master after Banquet