Merge pull request #265 from ping19/master

Bug list update