fixed #50, #49, #48, #47, #46. Also added it http://goo.gl/WPc9b7