Resolved Issue #7 

@leifdreizler

~requested 300