importing dev changes into master #36

Closed josuebrunel closed 8 years ago