Merge pull request #1 from ligershark/master

Merge latest from ligershark