Fixed bug http://goo.gl/igxORT and updated dependencies