[master]

- Fixed some bugs
	modified:   Makefile