WP8 implementation bugfix #51, #80, #81 by merging #153, thanks a lot to AlexB71