Fixed issues: #284 #285 #286 #287