Merge pull request #24 from zopsi/master

Minor update for Django Development Branch
Merge remote-tracking branch 'upstream/master'