Adding fixes

.gitignore

@@ -0,0 +1 @@
+node_modules

.jshintrc

@@ -8,6 +8,7 @@
 	"latedef": false,
 	"newcap": true,
 	"undef": true,
+	"camelcase": true,
 	"globals": {
 		"Modernizr": true
 	}

jquery.mosaicflow.js

@@ -59,7 +59,7 @@
 	Mosaicflow.prototype = {
 		init: function() {
 			this.__uid = cnt++;
-			this.__uid_item_counter = 0;
+			this.__uidItemCounter = 0;
 			this.items = this.container.find(this.options.itemSelector);
 			this.columns = $([]);
 			this.columnsHeights = [];
@@ -206,6 +206,7 @@
 			var height = 0;
 
 			if (this.autoCalculation) {
+
 				// Get height of elm
 				elm.css({
 					position: 'static',
@@ -215,6 +216,19 @@
 
 				height = elm.outerHeight();
 
+				var inlineImages = elm.find('img');
+				if (inlineImages.length !== 0) {
+
+					inlineImages.each(function() {
+						var image = $(this);
+						var imageSizes = getImageSizes(image);
+						var actualHeight = (image.width()*imageSizes.height)/imageSizes.width;
+
+						height += actualHeight;
+					});
+
+				}
+
 				elm.detach().css({
 					position: 'static',
 					visibility: 'visible'
@@ -304,10 +318,10 @@
 
 		generateUniqueId: function() {
 			// Increment the counter
-			this.__uid_item_counter++;
+			this.__uidItemCounter++;
 
 			// Return an unique ID
-			return 'mosaic-' + this.__uid + '-itemid-' + this.__uid_item_counter;
+			return 'mosaic-' + this.__uid + '-itemid-' + this.__uidItemCounter;
 		}
 	};
 
@@ -324,6 +338,23 @@
 		return options;
 	}
 
+	function getImageSizes(image) {
+		var sizes = {};
+
+		sizes.height = parseInt(image.attr('height'), 10);
+		sizes.width = parseInt(image.attr('width'), 10);
+
+		if (sizes.height === 0 || sizes.width === 0) {
+			var utilImage = new Image();
+			utilImage.src = image.attr('src');
+
+			sizes.width = utilImage.width;
+			sizes.height = utilImage.height;
+		}
+
+		return sizes;
+	}
+
 	// Auto init
 	$(function() { $('.mosaicflow').mosaicflow(); });