Merge pull request #26 from aptara/Sprint-4

Sprint 4
Merge pull request #28 from aptara/Sprint-4

Added missing files
Merge pull request #31 from aptara/Sprint-4

Sprint 4
Merge pull request #32 from aptara/master

merge from master