Fixed github issues:
7, 6, 10, 11, 12, 13, 15, 16.