Added support for windows phone