Cleaned source
Closed #65