Merge pull request #2 from skarllot/master

@skarllot modifications accepted