Bug fixes
Merge pull request #30 from timothymiko/feature-fragment

bug fixes