General code cleanup
Allow for duplicate API results (fixes #44)
Merge remote-tracking branch 'origin/master'