#15 Fix.
A lot of changes. =)