Removed duplicate functions using optional values
Merge pull request #2 from SoullessPG/Optional-Values

Removed duplicate functions using optional values
Merge remote-tracking branch 'upstream/master'