Issue #23

Sry mico but i was faster...