Merge pull request #1 from socram8888/master

Some updates