Fix issues
Merge pull request #252 from aptara/Sprint-5

Fix issues