Mirelsol's fork

Created to fix #10 issue