p2a
Merge pull request #2 from mehtryx/programmer2

p2a
Updated with new type safety