Importing commits from Xandros repo (#409-#416).

Close #409 .
Close #410 .
Close #411 .
Close #412 .
Close #414 .
Close #415 .
Close #416 .