fixed #22
Merge remote-tracking branch 'upstream/master'
filter .swo .swp .DS_Store