fix #1837#2061

Merged

josenavas merged 6 commits intoqiita-spots:masterfrom

antgonza:fix-1837

Feb 3, 2017

Commits on Jan 27, 2017

fix #1837
antgonza
committed

Commits on Jan 28, 2017

generalizing this functionality
antgonza
committed

Commits on Feb 1, 2017

addressing @josenavas comments
antgonza
committed

Commits on Feb 3, 2017