Added spec folder
Merge branch 'dev'