Merge pull request #1 from dmportella/master

Few enhancements to the source including small shuffle