PR comments - re-factoring
Merge pull request #1 from Icenium/natanasova/pr-comments

Fix WP8 corner case bugs