Merge pull request #16 from c103/dev

Dev to Master for 1.0
Adding import button
Merge branch 'dev'