Merge pull request #12 from ostiosis/master

Updating prinny-d with latest
Merge pull request #13 from ostiosis/prinny-dev-branch

Merge pull request #12 from ostiosis/master