dev to feature

@bsaiken : merging dev to feature branch