#8 Added Windows Phone and Windows Store support