Merge pull request #2 from cancerit/dev

split prefix
Merge pull request #3 from cancerit/dev

test only works when run internally
Merge pull request #4 from cancerit/dev

Fix padding
Merge pull request #5 from cancerit/master

Master - bring dev in sync